From 7b059db1d35d7244833b8cc63b7719db9e59d44f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 24 Feb 2015 11:14:38 -0800 Subject: [PATCH] Fixup warnings and the travis script --- .travis.install.deps.sh | 43 ++++++++++++++--------------- Cargo.lock | 6 ++-- src/cargo/lib.rs | 1 + src/cargo/ops/cargo_rustc/engine.rs | 8 +++--- src/cargo/util/process_builder.rs | 8 +++--- src/registry/lib.rs | 2 +- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh index 0962b8f45..0fc51e541 100755 --- a/.travis.install.deps.sh +++ b/.travis.install.deps.sh @@ -27,10 +27,10 @@ url=https://static-rust-lang-org.s3.amazonaws.com/dist/`cat src/rustversion.txt` # future anyway. if [ -z "${windows}" ]; then rm -rf rustc *.tar.gz - curl -O $url/rust-nightly-i686-$target.tar.gz - curl -O $url/rust-nightly-x86_64-$target.tar.gz - tar xfz rust-nightly-i686-$target.tar.gz - tar xfz rust-nightly-x86_64-$target.tar.gz + curl -O $url/rustc-nightly-i686-$target.tar.gz + curl -O $url/rustc-nightly-x86_64-$target.tar.gz + tar xfz rustc-nightly-i686-$target.tar.gz + tar xfz rustc-nightly-x86_64-$target.tar.gz if [ "${BITS}" = "32" ]; then src=x86_64 @@ -39,32 +39,29 @@ if [ -z "${windows}" ]; then src=i686 dst=x86_64 fi - cp -r rust-nightly-$src-$target/rustc/lib/rustlib/$src-$target \ - rust-nightly-$dst-$target/rustc/lib/rustlib - (cd rust-nightly-$dst-$target && \ - find rustc/lib/rustlib/$src-$target/lib -type f | sed 's/^/file:/' >> \ - manifest-rustc.in) + cp -r rustc-nightly-$src-$target/rustc/lib/rustlib/$src-$target \ + rustc-nightly-$dst-$target/rustc/lib/rustlib + (cd rustc-nightly-$dst-$target && \ + find rustc/lib/rustlib/$src-$target/lib -type f | \ + sed 's/^rustc\//file:/' >> rustc/manifest.in) - ./rust-nightly-$dst-$target/install.sh --prefix=rustc - rm -rf rust-nightly-$src-$target - rm -rf rust-nightly-$dst-$target - rm -f rust-nightly-i686-$target.tar.gz - rm -f rust-nightly-x86_64-$target.tar.gz + ./rustc-nightly-$dst-$target/install.sh --prefix=rustc + rm -rf rustc-nightly-$src-$target + rm -rf rustc-nightly-$dst-$target + rm -f rustc-nightly-i686-$target.tar.gz + rm -f rustc-nightly-x86_64-$target.tar.gz else - rm -rf rustc *.exe + rm -rf rustc *.exe *.tar.gz if [ "${BITS}" = "64" ]; then triple=x86_64-pc-windows-gnu else triple=i686-pc-windows-gnu fi - curl -O $url/rust-nightly-$triple.exe - innounp -y -x rust-nightly-$triple.exe - mv '{app}' rustc - # Don't use the bundled gcc, see rust-lang/rust#17442 - rm -rf rustc/bin/rustlib/$triple/bin - # Don't use bundled gcc libs, see rust-lang/rust#19519 - rm -rf rustc/bin/rustlib/$triple/lib/libmingw*.a - rm -f rust-nightly-$triple.exe + curl -O $url/rustc-nightly-$triple.tar.gz + tar xfz rustc-nightly-$triple.tar.gz + ./rustc-nightly-$triple/install.sh --prefix=rustc + rm -rf rustc-nightly-$triple + rm -f rustc-nightly-$triple.tar.gz fi set +x diff --git a/Cargo.lock b/Cargo.lock index 860815871..b70a7fff6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,7 @@ dependencies = [ "docopt 0.6.39 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "git2-curl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", @@ -98,7 +98,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "git2" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -112,7 +112,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "curl 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index ad0e7b59a..f45a46398 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -1,6 +1,7 @@ #![deny(unused)] #![feature(collections, hash, libc, os, std_misc, unicode, env, core)] #![feature(old_io, old_path, str_words)] +#![cfg_attr(test, deny(warnings))] extern crate libc; extern crate "rustc-serialize" as rustc_serialize; diff --git a/src/cargo/ops/cargo_rustc/engine.rs b/src/cargo/ops/cargo_rustc/engine.rs index 9d234f882..580084b9d 100644 --- a/src/cargo/ops/cargo_rustc/engine.rs +++ b/src/cargo/ops/cargo_rustc/engine.rs @@ -52,13 +52,13 @@ impl CommandPrototype { } pub fn arg(mut self, arg: T) -> CommandPrototype { - self.args.push(CString::from_slice(arg.container_as_bytes())); + self.args.push(CString::new(arg.container_as_bytes()).unwrap()); self } pub fn args(mut self, arguments: &[T]) -> CommandPrototype { self.args.extend(arguments.iter().map(|t| { - CString::from_slice(t.container_as_bytes()) + CString::new(t.container_as_bytes()).unwrap() })); self } @@ -78,14 +78,14 @@ impl CommandPrototype { pub fn env(mut self, key: &str, val: Option) -> CommandPrototype { - let val = val.map(|t| CString::from_slice(t.container_as_bytes())); + let val = val.map(|t| CString::new(t.container_as_bytes()).unwrap()); self.env.insert(key.to_string(), val); self } pub fn get_env(&self, var: &str) -> Option { self.env.get(var).cloned().or_else(|| { - Some(env::var(var).ok().map(|s| CString::from_vec(s.into_bytes()))) + Some(env::var(var).ok().map(|s| CString::new(s).unwrap())) }).and_then(|val| val) } diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index 207bea3b3..f6fe4d2aa 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -29,13 +29,13 @@ impl fmt::Display for ProcessBuilder { impl ProcessBuilder { pub fn arg(mut self, arg: T) -> ProcessBuilder { - self.args.push(CString::from_slice(arg.container_as_bytes())); + self.args.push(CString::new(arg.container_as_bytes()).unwrap()); self } pub fn args(mut self, arguments: &[T]) -> ProcessBuilder { self.args.extend(arguments.iter().map(|t| { - CString::from_slice(t.container_as_bytes()) + CString::new(t.container_as_bytes()).unwrap() })); self } @@ -51,7 +51,7 @@ impl ProcessBuilder { pub fn env(mut self, key: &str, val: Option) -> ProcessBuilder { - let val = val.map(|t| CString::from_slice(t.container_as_bytes())); + let val = val.map(|t| CString::new(t.container_as_bytes()).unwrap()); self.env.insert(key.to_string(), val); self } @@ -123,7 +123,7 @@ impl ProcessBuilder { pub fn process(cmd: T) -> CargoResult { Ok(ProcessBuilder { - program: CString::from_slice(cmd.container_as_bytes()), + program: CString::new(cmd.container_as_bytes()).unwrap(), args: Vec::new(), cwd: try!(env::current_dir()), env: HashMap::new(), diff --git a/src/registry/lib.rs b/src/registry/lib.rs index 75b89624f..48ca595b1 100644 --- a/src/registry/lib.rs +++ b/src/registry/lib.rs @@ -1,4 +1,4 @@ -#![feature(core, io, path)] +#![feature(core, old_io, old_path)] extern crate curl; extern crate "rustc-serialize" as rustc_serialize; -- 2.30.2